-
Notifications
You must be signed in to change notification settings - Fork 1.1k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
server: fix nfs version option during mounts #9559
Conversation
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## 4.19 #9559 +/- ##
============================================
- Coverage 15.08% 15.08% -0.01%
- Complexity 11185 11187 +2
============================================
Files 5406 5406
Lines 473123 473143 +20
Branches 61313 60436 -877
============================================
- Hits 71378 71374 -4
- Misses 393805 393828 +23
- Partials 7940 7941 +1
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
engine/schema/src/main/java/com/cloud/upgrade/SystemVmTemplateRegistration.java
Show resolved
Hide resolved
engine/schema/src/main/java/com/cloud/upgrade/SystemVmTemplateRegistration.java
Outdated
Show resolved
Hide resolved
@blueorangutan package |
@weizhouapache a [SL] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress. |
Packaging result [SF]: ✔️ el8 ✔️ el9 ✔️ debian ✔️ suse15. SL-JID 10743 |
Fixes apache#9469 Signed-off-by: Abhishek Kumar <[email protected]>
691c3b7
to
3445407
Compare
@blueorangutan package |
@shwstppr a [SL] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress. |
Packaging result [SF]: ✔️ el8 ✔️ el9 ✔️ debian ✔️ suse15. SL-JID 10867 |
@blueorangutan package |
@shwstppr a [SL] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress. |
Packaging result [SF]: ✔️ el8 ✔️ el9 ✔️ debian ✔️ suse15. SL-JID 10926 |
@blueorangutan test |
@shwstppr a [SL] Trillian-Jenkins test job (ol8 mgmt + kvm-ol8) has been kicked to run smoke tests |
[SF] Trillian test result (tid-11312)
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM. Didn't test.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
clgtm
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
code lgtm
@blueorangutan package |
@DaanHoogland a [SL] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress. |
Packaging result [SF]: ✔️ el8 ✔️ el9 ✔️ debian ✔️ suse15. SL-JID 11029 |
@blueorangutan test |
@DaanHoogland a [SL] Trillian-Jenkins test job (ol8 mgmt + kvm-ol8) has been kicked to run smoke tests |
[SF] Trillian test result (tid-11401)
|
@JoaoJandre this looks like a good to have for 4.20 (and 4.19) can you concur? |
@DaanHoogland yes but it seems that no one tested the PR (yet). If we can get some manual tests on it before the freeze I think it should be in 4.20 |
trying to fit it in @JoaoJandre ;) |
public static String getMountCommand(String nfsVersion, String device, String dir) { | ||
String cmd = "sudo mount -t nfs"; | ||
if (StringUtils.isNotBlank(nfsVersion)) { | ||
cmd = String.format("%s -o vers=%s", cmd, nfsVersion); | ||
} | ||
return String.format("%s %s %s", cmd, device, dir); | ||
} | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this looks like a good generic method for creating the mount command, but it is in SystemVmTemplateRegistration
. Does it make sense to move it to a utility and search for other places to use this, @shwstppr ? (some deduplication may be resulting)
This got a bit behind in priority, need to create an env that doesn't support nfsv3 to do a functional test. |
Tested according to the initial issue:
|
Signed-off-by: Abhishek Kumar <[email protected]>
Description
Fixes #9469
Types of changes
Feature/Enhancement Scale or Bug Severity
Feature/Enhancement Scale
Bug Severity
Screenshots (if appropriate):
How Has This Been Tested?
How did you try to break this feature and the system with this change?